Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Encapsulate UserDataStore in UserService #23866

Merged
merged 3 commits into from
Dec 1, 2024
Merged

Encapsulate UserDataStore in UserService #23866

merged 3 commits into from
Dec 1, 2024
+72 −28

Conversation

crazytonyli
Copy link
Contributor

View model no longer has direct access to the underly data store instance.

Regression Notes

  1. Potential unintended areas of impact

  2. What I did to test those areas of impact (or what existing automated tests I relied on)

  3. What automated tests I added (or what prevented me from doing so)

PR submission checklist:

  • I have completed the Regression Notes.
  • I have considered adding unit tests for my changes.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

Testing checklist:

  • WordPress.com sites and self-hosted Jetpack sites.
  • Portrait and landscape orientations.
  • Light and dark modes.
  • Fonts: Larger, smaller and bold text.
  • High contrast.
  • VoiceOver.
  • Languages with large words or with letters/accents not frequently used in English.
  • Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
  • iPhone and iPad.
  • Multi-tasking: Split view and Slide over. (iPad)

@crazytonyli crazytonyli added this to the 25.6 milestone Nov 29, 2024
@crazytonyli crazytonyli requested a review from jkmassel November 29, 2024 01:29
@dangermattic
Copy link
Collaborator

2 Warnings
⚠️ View files have been modified, but no screenshot or video is included in the pull request. Consider adding some for clarity.
⚠️ This PR is assigned to the milestone 25.6. The due date for this milestone has already passed.
Please assign it to a milestone with a later deadline or check whether the release for this milestone has already been finished.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Nov 29, 2024 •
edited
Loading

WordPress Alpha📲 You can test the changes from this Pull Request in WordPress Alpha by scanning the QR code below to install the corresponding build.
App NameWordPress Alpha WordPress Alpha
ConfigurationRelease-Alpha
Build Numberpr23866-e5858bd
Version25.4.2
Bundle IDorg.wordpress.alpha
Commite5858bd
App Center BuildWPiOS - One-Offs #11142
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Nov 29, 2024 •
edited
Loading

Jetpack Alpha📲 You can test the changes from this Pull Request in Jetpack Alpha by scanning the QR code below to install the corresponding build.
App NameJetpack Alpha Jetpack Alpha
ConfigurationRelease-Alpha
Build Numberpr23866-e5858bd
Version25.4.2
Bundle IDcom.jetpack.alpha
Commite5858bd
App Center Buildjetpack-installable-builds #10181
 Automatticians: You can use our internal self-serve MC tool to give yourself access to App Center if needed.

jkmassel
jkmassel approved these changes Nov 29, 2024
View reviewed changes
Copy link
Contributor

@jkmassel jkmassel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but left some thoughts

WordPress/Classes/Services/UserService.swift
var dataStore: any UserDataStore {
_dataStore
}
var userDataStore: any UserDataStore { _dataStore }
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need the extra indirection here? Could userDataStore just be the canonical object?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When declaring it as var userDataStore: InMemoryUserDataStore, the compiler complains that the signature does not match the one in UserServiceProtocol.

WordPress/Classes/Users/UserProvider.swift
}

extension UserServiceProtocol where Self: UserDataStoreProvider {
func allUsers() async throws -> [DisplayUser] {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I bet this could be generic, but we can do that later.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mind elaborating on this?

@crazytonyli crazytonyli enabled auto-merge December 1, 2024 01:04
@crazytonyli crazytonyli added this pull request to the merge queue Dec 1, 2024
Merged via the queue into trunk with commit bd13607 Dec 1, 2024
24 checks passed
@crazytonyli crazytonyli deleted the prototype/view-model-service-data-store branch December 1, 2024 01:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jkmassel jkmassel jkmassel approved these changes

Assignees
No one assigned
Labels
[Type] Enhancement
Projects
None yet
Milestone
25.6 ❄️
Development

Successfully merging this pull request may close these issues.
4 participants
@crazytonyli @dangermattic @wpmobilebot @jkmassel